Add BABL_IS_BEING_COMPILED #define support

Sometimes it is ok that babl includes are included directly and not
through babl.h, like when we generate GObject introspection files.

The important thing is just that users of the babl API don't begin to
include headers we don't guarantee to always exist, and
BABL_IS_BEING_COMPILED doesn't obstruct this goal.

diff --git a/babl/Makefile.am b/babl/Makefile.am
index 979afb5b79c104afccc1de93eb08a85aa097bf49..182326513ba335c7cb9239364f7ee0530c4c4cf7 100644 (file)
--- a/babl/Makefile.am
+++ b/babl/Makefile.am
@@ -96,6 +96,7 @@ Babl-$(BABL_API_VERSION).gir: $(G_IR_SCANNER) $(library_include_HEADERS) $(c_sou
             --libtool="$(LIBTOOL)" \
             --output $@ \
             --pkg babl \
+            -DBABL_IS_BEING_COMPILED \
            -I$(top_srcdir) \
            -I$(top_builddir) \
            $(library_include_HEADERS) \

diff --git a/babl/babl-macros.h b/babl/babl-macros.h
index 8de6864930be91268c204c5a5bb8a569fd7c0975..f022d9f9f0bebc6657a66e1010049d98aae7415f 100644 (file)
--- a/babl/babl-macros.h
+++ b/babl/babl-macros.h
@@ -19,7 +19,7 @@
 #ifndef _BABL_MACROS_H
 #define _BABL_MACROS_H
 
-#ifndef BABL_INSIDE_BABL_H
+#if !defined(BABL_INSIDE_BABL_H) && !defined(BABL_IS_BEING_COMPILED)
 #error "babl-version.h must not be included directly, include babl.h instead."
 #endif
 

diff --git a/babl/babl-types.h b/babl/babl-types.h
index d1deae745f8a99ff9268255949e23edc1d65008d..162e6c9a25185dedd55bd38efc6ae9897a3edaa3 100644 (file)
--- a/babl/babl-types.h
+++ b/babl/babl-types.h
@@ -19,7 +19,7 @@
 #ifndef _BABL_TYPES_H
 #define _BABL_TYPES_H
 
-#ifndef BABL_INSIDE_BABL_H
+#if !defined(BABL_INSIDE_BABL_H) && !defined(BABL_IS_BEING_COMPILED)
 #error "babl-version.h must not be included directly, include babl.h instead."
 #endif
 

diff --git a/babl/babl-version.h.in b/babl/babl-version.h.in
index 97890994a21101b71a7f6c4622b9e57d77223a04..ab008244cb969dd159b7e7849025d1d04799d506 100644 (file)
--- a/babl/babl-version.h.in
+++ b/babl/babl-version.h.in
@@ -19,7 +19,7 @@
 #ifndef _BABL_VERSION_H
 #define _BABL_VERSION_H
 
-#ifndef BABL_INSIDE_BABL_H
+#if !defined(BABL_INSIDE_BABL_H) && !defined(BABL_IS_BEING_COMPILED)
 #error "babl-version.h must not be included directly, include babl.h instead."
 #endif